Test whether type is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before

1998-09-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>

	* gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type
	is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that
	(widget != NULL), otherwise radio button insertion will not work
	-- the widget argument is NULL for the first radio button in the
	group.

diff --git a/ChangeLog b/ChangeLog
index 5b54c5308c55a35aa8a21d5956c27471e799090b..88c48a3d383cd74713aa63e94751edb2b887f5b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1998-09-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type
+       is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that
+       (widget != NULL), otherwise radio button insertion will not work
+       -- the widget argument is NULL for the first radio button in the
+       group.
+
 Tue Sep 15 13:09:24 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_new): Reverted global changes
@@ -55,6 +63,7 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
          free()s.  X itself uses free() on some of the 
          malloced memory.
 
+>>>>>>> 1.633
 Sat Sep 12 10:44:06 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtkfilesel.c: Maintain a list of directories like

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5b54c5308c55a35aa8a21d5956c27471e799090b..88c48a3d383cd74713aa63e94751edb2b887f5b8 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+1998-09-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type
+       is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that
+       (widget != NULL), otherwise radio button insertion will not work
+       -- the widget argument is NULL for the first radio button in the
+       group.
+
 Tue Sep 15 13:09:24 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_new): Reverted global changes
@@ -55,6 +63,7 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
          free()s.  X itself uses free() on some of the 
          malloced memory.
 
+>>>>>>> 1.633
 Sat Sep 12 10:44:06 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtkfilesel.c: Maintain a list of directories like

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5b54c5308c55a35aa8a21d5956c27471e799090b..88c48a3d383cd74713aa63e94751edb2b887f5b8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+1998-09-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type
+       is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that
+       (widget != NULL), otherwise radio button insertion will not work
+       -- the widget argument is NULL for the first radio button in the
+       group.
+
 Tue Sep 15 13:09:24 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_new): Reverted global changes
@@ -55,6 +63,7 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
          free()s.  X itself uses free() on some of the 
          malloced memory.
 
+>>>>>>> 1.633
 Sat Sep 12 10:44:06 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtkfilesel.c: Maintain a list of directories like

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5b54c5308c55a35aa8a21d5956c27471e799090b..88c48a3d383cd74713aa63e94751edb2b887f5b8 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+1998-09-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type
+       is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that
+       (widget != NULL), otherwise radio button insertion will not work
+       -- the widget argument is NULL for the first radio button in the
+       group.
+
 Tue Sep 15 13:09:24 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_new): Reverted global changes
@@ -55,6 +63,7 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
          free()s.  X itself uses free() on some of the 
          malloced memory.
 
+>>>>>>> 1.633
 Sat Sep 12 10:44:06 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtkfilesel.c: Maintain a list of directories like

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5b54c5308c55a35aa8a21d5956c27471e799090b..88c48a3d383cd74713aa63e94751edb2b887f5b8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+1998-09-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type
+       is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that
+       (widget != NULL), otherwise radio button insertion will not work
+       -- the widget argument is NULL for the first radio button in the
+       group.
+
 Tue Sep 15 13:09:24 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_new): Reverted global changes
@@ -55,6 +63,7 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
          free()s.  X itself uses free() on some of the 
          malloced memory.
 
+>>>>>>> 1.633
 Sat Sep 12 10:44:06 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtkfilesel.c: Maintain a list of directories like

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5b54c5308c55a35aa8a21d5956c27471e799090b..88c48a3d383cd74713aa63e94751edb2b887f5b8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+1998-09-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type
+       is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that
+       (widget != NULL), otherwise radio button insertion will not work
+       -- the widget argument is NULL for the first radio button in the
+       group.
+
 Tue Sep 15 13:09:24 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_new): Reverted global changes
@@ -55,6 +63,7 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
          free()s.  X itself uses free() on some of the 
          malloced memory.
 
+>>>>>>> 1.633
 Sat Sep 12 10:44:06 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtkfilesel.c: Maintain a list of directories like

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5b54c5308c55a35aa8a21d5956c27471e799090b..88c48a3d383cd74713aa63e94751edb2b887f5b8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+1998-09-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type
+       is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that
+       (widget != NULL), otherwise radio button insertion will not work
+       -- the widget argument is NULL for the first radio button in the
+       group.
+
 Tue Sep 15 13:09:24 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_new): Reverted global changes
@@ -55,6 +63,7 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
          free()s.  X itself uses free() on some of the 
          malloced memory.
 
+>>>>>>> 1.633
 Sat Sep 12 10:44:06 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtkfilesel.c: Maintain a list of directories like

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 8457d6c7de2c5d48804033a4b8751e06f267d5d7..4970cbabd7a0534eff3dff1d0eade245f166b5fb 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -743,7 +743,7 @@ gtk_toolbar_insert_element (GtkToolbar          *toolbar,
       g_return_val_if_fail (widget != NULL, NULL);
       g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
     }
-  else
+  else if (type != GTK_TOOLBAR_CHILD_RADIOBUTTON)
     g_return_val_if_fail (widget == NULL, NULL);
 
   child = g_new (GtkToolbarChild, 1);